Skip to content

Clean up namespaces - part 2 (backport #642) #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
May 30, 2025
Merged

Clean up namespaces - part 2 (backport #642) #644

merged 2 commits into from
May 30, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2025

Splitting the work created from @mjcarroll in #502. This is tweaking the header files under gz/transport.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

This is an automatic backport of pull request #642 done by Mergify.

@caguero @mergify
Clean up namespaces - part 2 (#642)
b45b4b7 
Signed-off-by: Carlos Agüero <caguero@osrfoundation.org>
(cherry picked from commit bd39167)

# Conflicts:
#	include/gz/transport/Node.hh
@mergify mergify bot requested a review from caguero as a code owner May 29, 2025 12:31
@mergify mergify bot added the conflicts label May 29, 2025
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 29, 2025

Cherry-pick of bd39167 has failed:

On branch mergify/bp/gz-transport13/pr-642
Your branch is up to date with 'origin/gz-transport13'.

You are currently cherry-picking commit bd39167.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/gz/transport/HandlerStorage.hh
	modified:   include/gz/transport/Helpers.hh
	modified:   include/gz/transport/MessageInfo.hh
	modified:   include/gz/transport/NetUtils.hh
	modified:   include/gz/transport/NodeOptions.hh
	modified:   include/gz/transport/NodeShared.hh
	modified:   include/gz/transport/Publisher.hh
	modified:   include/gz/transport/RepHandler.hh
	modified:   include/gz/transport/ReqHandler.hh
	modified:   include/gz/transport/SubscribeOptions.hh
	modified:   include/gz/transport/SubscriptionHandler.hh
	modified:   include/gz/transport/TopicStatistics.hh
	modified:   include/gz/transport/TopicStorage.hh
	modified:   include/gz/transport/TopicUtils.hh
	modified:   include/gz/transport/TransportTypes.hh
	modified:   include/gz/transport/Uuid.hh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/gz/transport/Node.hh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 29, 2025
Merged
8 tasks
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label May 29, 2025
@caguero
Fix conflicts
9fcca0b 
Signed-off-by: Carlos Agüero <caguero@osrfoundation.org>
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development May 30, 2025
@caguero caguero merged commit 9d1d79c into gz-transport13 May 30, 2025
9 checks passed
@caguero caguero deleted the mergify/bp/gz-transport13/pr-642 branch May 30, 2025 07:18
@github-project-automation github-project-automation bot moved this from In review to Done in Core development May 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@caguero caguero caguero approved these changes

Assignees

No one assigned

Labels

conflicts 🎵 harmonic Gazebo Harmonic

Projects

Core development
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@caguero